Dump AtkComponent properties

Note that the spatial aspects of AtkComponent are all dependent
on fonts and other environmental factors, thus we only dump the
little bits outside of that.

diff --git a/tests/a11y/accessibility-dump.c b/tests/a11y/accessibility-dump.c
index be0950b0b5cffcb6435a681f9dee4b5079de2ed9..457b46173d8af8ff0f7f73423f295afc0faa2cfc 100644 (file)
--- a/tests/a11y/accessibility-dump.c
+++ b/tests/a11y/accessibility-dump.c
@@ -264,6 +264,36 @@ dump_text_attributes (GString         *string,
   atk_attribute_set_free (attributes);
 }
 
+extern GType atk_layer_get_type (void);
+
+static const gchar *
+layer_name (AtkLayer layer)
+{
+  GEnumClass *class;
+  GEnumValue *value;
+
+  class = g_type_class_ref (atk_layer_get_type ());
+  value = g_enum_get_value (class, layer);
+  g_type_class_unref (class);
+
+  return value->value_nick;
+}
+
+static void
+dump_atk_component (AtkComponent *atk_component,
+                    guint         depth,
+                    GString      *string)
+{
+  AtkLayer layer;
+
+  g_string_append_printf (string, "%*s<AtkComponent>\n", depth, "");
+
+  layer = atk_component_get_layer (atk_component);
+  g_string_append_printf (string, "%*slayer: %s\n", depth, "", layer_name (layer));
+
+  g_string_append_printf (string, "%*salpha: %g\n", depth, "", atk_component_get_alpha (atk_component));
+}
+
 static void
 dump_atk_text (AtkText *atk_text,
                guint    depth,
@@ -435,6 +465,9 @@ dump_accessible (AtkObject     *accessible,
   dump_state_set (string, depth, atk_object_ref_state_set (accessible));
   dump_attribute_set (string, depth, atk_object_get_attributes (accessible));
 
+  if (ATK_IS_COMPONENT (accessible))
+    dump_atk_component (ATK_COMPONENT (accessible), depth, string);
+
   if (ATK_IS_TEXT (accessible))
     dump_atk_text (ATK_TEXT (accessible), depth, string);
 

diff --git a/tests/a11y/accessible-name.txt b/tests/a11y/accessible-name.txt
index cc427fdf61057ecfe0dc1415dcef88f3e2623e0d..cd88807fd160d73fc16bc53e59b8c640ef73fdfc 100644 (file)
--- a/tests/a11y/accessible-name.txt
+++ b/tests/a11y/accessible-name.txt
@@ -3,6 +3,9 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gail
+  <AtkComponent>
+  layer: window
+  alpha: 1
   button1
     "push button"
     parent: window1
@@ -10,6 +13,9 @@ window1
     name: Accessible name
     state: enabled focusable sensitive showing visible
     toolkit: gail
+    <AtkComponent>
+    layer: widget
+    alpha: 1
     <AtkText>
     text: Hello World!
     character count: 12

diff --git a/tests/a11y/hello-world.txt b/tests/a11y/hello-world.txt
index 1714b4a1840fe10d15ca7350177abaef35b7db96..92fab6128892b5d2c2382d3a140c4bacda5630de 100644 (file)
--- a/tests/a11y/hello-world.txt
+++ b/tests/a11y/hello-world.txt
@@ -3,6 +3,9 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gail
+  <AtkComponent>
+  layer: window
+  alpha: 1
   button1
     "push button"
     parent: window1
@@ -10,6 +13,9 @@ window1
     name: Hello World!
     state: enabled focusable sensitive showing visible
     toolkit: gail
+    <AtkComponent>
+    layer: widget
+    alpha: 1
     <AtkText>
     text: Hello World!
     character count: 12

diff --git a/tests/a11y/link.txt b/tests/a11y/link.txt
index 7866eff1e3232cb0b09ecf34d23cd72bd04ff994..629917afc80ad81d0ff6b5f116cfb0b1fddb910f 100644 (file)
--- a/tests/a11y/link.txt
+++ b/tests/a11y/link.txt
@@ -3,6 +3,9 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gail
+  <AtkComponent>
+  layer: window
+  alpha: 1
   button1
     "push button"
     parent: window1
@@ -10,6 +13,9 @@ window1
     name: Hello World!
     state: enabled focusable sensitive showing visible
     toolkit: gail
+    <AtkComponent>
+    layer: widget
+    alpha: 1
     <AtkText>
     text: Hello World!
     character count: 12

diff --git a/tests/a11y/mnemonic.txt b/tests/a11y/mnemonic.txt
index ea5dc31bf76a0c47edd9b6d8b11c7291d7bde9ed..ae3ff4c3acb9ff207a933bbda2bd17ba74986ac2 100644 (file)
--- a/tests/a11y/mnemonic.txt
+++ b/tests/a11y/mnemonic.txt
@@ -3,12 +3,18 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gail
+  <AtkComponent>
+  layer: window
+  alpha: 1
   box1
     "filler"
     parent: window1
     index: 0
     state: enabled horizontal sensitive
     toolkit: gail
+    <AtkComponent>
+    layer: widget
+    alpha: 1
     label1
       "label"
       parent: box1
@@ -17,6 +23,9 @@ window1
       label-for: entry1
       state: enabled multi-line sensitive visible
       toolkit: gail
+      <AtkComponent>
+      layer: widget
+      alpha: 1
       <AtkText>
       text: Entry:
       character count: 6
@@ -29,6 +38,9 @@ window1
       labelled-by: label1
       state: editable enabled focusable sensitive single-line visible
       toolkit: gail
+      <AtkComponent>
+      layer: widget
+      alpha: 1
       <AtkText>
       text: text
       character count: 4

diff --git a/tests/a11y/notebook.txt b/tests/a11y/notebook.txt
index 18258afcce60e6611622ab4563e7a1a72e43ec04..49eb9b0e343014acc373745eab372f984b6446f0 100644 (file)
--- a/tests/a11y/notebook.txt
+++ b/tests/a11y/notebook.txt
@@ -3,12 +3,18 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gail
+  <AtkComponent>
+  layer: window
+  alpha: 1
   notebook1
     "page tab list"
     parent: window1
     index: 0
     state: enabled focusable sensitive showing visible
     toolkit: gail
+    <AtkComponent>
+    layer: widget
+    alpha: 1
     <AtkSelection>
     selection count: 1
     selected children: 0
@@ -18,6 +24,9 @@ window1
       index: 0
       name: Tab 1
       state: enabled multi-line selectable selected sensitive showing visible
+      <AtkComponent>
+      layer: widget
+      alpha: 1
       <AtkText>
       text: Tab 1
       character count: 5
@@ -29,6 +38,9 @@ window1
         name: Yes
         state: enabled focusable sensitive showing visible
         toolkit: gail
+        <AtkComponent>
+        layer: widget
+        alpha: 1
         <AtkText>
         text: Yes
         character count: 3
@@ -48,6 +60,9 @@ window1
       index: 1
       name: Tab 2
       state: enabled multi-line selectable sensitive showing visible
+      <AtkComponent>
+      layer: widget
+      alpha: 1
       <AtkText>
       text: Tab 2
       character count: 5
@@ -59,6 +74,9 @@ window1
         name: No
         state: enabled focusable sensitive visible
         toolkit: gail
+        <AtkComponent>
+        layer: widget
+        alpha: 1
         <AtkText>
         text: No
         character count: 2

diff --git a/tests/a11y/range.txt b/tests/a11y/range.txt
index 75e3939fc352db8d87c4e98fc7b9c4b41fbdbd84..56007ad0a00276057ab3c62cfc2add1ae4bd0431 100644 (file)
--- a/tests/a11y/range.txt
+++ b/tests/a11y/range.txt
@@ -3,12 +3,18 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gail
+  <AtkComponent>
+  layer: window
+  alpha: 1
   scale1
     "slider"
     parent: window1
     index: 0
     state: enabled focusable horizontal sensitive showing visible
     toolkit: gail
+    <AtkComponent>
+    layer: widget
+    alpha: 1
     <AtkText>
     text: ‎45.5
     character count: 5

diff --git a/tests/a11y/text.txt b/tests/a11y/text.txt
index 8293910fd301ee8130839be276d29207e4d54234..434bac80eacecd7341bf304399a5f823f5f6836c 100644 (file)
--- a/tests/a11y/text.txt
+++ b/tests/a11y/text.txt
@@ -3,12 +3,18 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gail
+  <AtkComponent>
+  layer: window
+  alpha: 1
   text1
     "text"
     parent: window1
     index: 0
     state: editable enabled focusable multi-line sensitive showing visible
     toolkit: gail
+    <AtkComponent>
+    layer: widget
+    alpha: 1
     <AtkText>
     text: Twas brillig, and the slithy toves
 Did gyre and gimple in the wabe